make src/core and jeeps includes relative to top cli directory (#688)

* make jeeps includes relative to cli diretory.

* make src/core includes all relative to top level src dir.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f0b3dbfcbda0b3ba188f15fe40be2194e96dcde..b2bd6df85016b120a970f9b37bfcdbc257a804cd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,7 +206,6 @@ if(UNIX)
   set(SOURCES ${SOURCES} gbser_posix.cc)
   set(HEADERS ${HEADERS} gbser_posix.h)
   set(JEEPS ${JEEPS} jeeps/gpslibusb.cc)
-  include_directories(AFTER jeeps)
   add_compile_options(-O2 -Wall)
 endif()
 

diff --git a/GPSBabel.pro b/GPSBabel.pro
index b219381594835254b7b930c2991ab4eba08395cf..620db9869103001de779f19657abca8f36efab7b 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -224,7 +224,6 @@ macx|linux|openbsd {
   }
   SOURCES += gbser_posix.cc
   HEADERS += gbser_posix.h
-  INCLUDEPATH += jeeps
 }
 
 win32 {

diff --git a/jeeps/garminusb.h b/jeeps/garminusb.h
index 4bed01eece3af042ab25fefd2186ea122dcb61fa..5fd0136ace23f44977c7a654d86454932f8cb3d4 100644 (file)
--- a/jeeps/garminusb.h
+++ b/jeeps/garminusb.h
@@ -19,7 +19,7 @@
 
  */
 #include <cstdio>
-#include "gpsdevice.h"
+#include "jeeps/gpsdevice.h"
 
 /* This structure is a bit funny looking to avoid variable length
  * arrays which aren't present in C89.   This contains the visible

diff --git a/jeeps/gps.h b/jeeps/gps.h
index c938f99de3fb7183dee3d9967e9f54401fa88e0d..1efc420d9b20642f71e2fa5382d68929740b2236 100644 (file)
--- a/jeeps/gps.h
+++ b/jeeps/gps.h
@@ -1,8 +1,8 @@
 #ifndef gps_h
 #define gps_h
 
-#include "../defs.h"
-#include "gpsport.h"
+#include "defs.h"
+#include "jeeps/gpsport.h"
 #include <ctime>
 
 #define FRAMING_ERROR  -1
@@ -249,17 +249,17 @@ typedef struct GPS_SCourse_Limits {
 
 typedef int (*pcb_fn)(int, struct GPS_SWay**);
 
-#include "gpsdevice.h"
-#include "gpssend.h"
-#include "gpsread.h"
-#include "gpsutil.h"
-#include "gpsapp.h"
-#include "gpsprot.h"
-#include "gpscom.h"
-#include "gpsfmt.h"
-#include "gpsmath.h"
-#include "gpsmem.h"
-#include "gpsrqst.h"
+#include "jeeps/gpsdevice.h"
+#include "jeeps/gpssend.h"
+#include "jeeps/gpsread.h"
+#include "jeeps/gpsutil.h"
+#include "jeeps/gpsapp.h"
+#include "jeeps/gpsprot.h"
+#include "jeeps/gpscom.h"
+#include "jeeps/gpsfmt.h"
+#include "jeeps/gpsmath.h"
+#include "jeeps/gpsmem.h"
+#include "jeeps/gpsrqst.h"
 
 extern time_t gps_save_time;
 extern double gps_save_lat;

diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc
index c66f28a151cb50d297c4ac5191857bd04485d6eb..6390cbce7c62ed19c07d3d22a46ba075a8ce4403 100644 (file)
--- a/jeeps/gpsapp.cc
+++ b/jeeps/gpsapp.cc
@@ -23,7 +23,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cctype>
 #include <cstdio>
 #include <cstdlib>
@@ -36,9 +36,9 @@
  * This violates the layering design, but is needed for device discovery.
  * See the use of gps_is_usb and GPS_Packet_Read_usb below.
  */
-#include "garminusb.h"
-#include "gpsserial.h"
-#include "gpsusbint.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gpsserial.h"
+#include "jeeps/gpsusbint.h"
 
 time_t gps_save_time;
 double gps_save_lat;

diff --git a/jeeps/gpsapp.h b/jeeps/gpsapp.h
index 7cfca874eb2d45c96db0e2557f6b7360a97664ef..e6d5d47711c2d52e5f92ea871acaff896b1bae83 100644 (file)
--- a/jeeps/gpsapp.h
+++ b/jeeps/gpsapp.h
@@ -2,7 +2,7 @@
 #define gpsapp_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   int32  GPS_Init(const char* port);
 

diff --git a/jeeps/gpscom.cc b/jeeps/gpscom.cc
index cc847165e8f20f565818e538b4d2f95cbe430b12..e209ece092bbc5560f44422877c72a379dbbe189 100644 (file)
--- a/jeeps/gpscom.cc
+++ b/jeeps/gpscom.cc
@@ -24,7 +24,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cfloat>
 #include <cstdio>
 #include <cstdlib>

diff --git a/jeeps/gpscom.h b/jeeps/gpscom.h
index 7bbd6a66d92f5f325c8a1f4268dc1665a7dd75d0..5fcbe9a0a04181df02cae7c81ddf07ca06da9985 100644 (file)
--- a/jeeps/gpscom.h
+++ b/jeeps/gpscom.h
@@ -2,7 +2,7 @@
 #define gpscom_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <ctime>
 
   int32  GPS_Command_Off(const char* port);

diff --git a/jeeps/gpsdevice.cc b/jeeps/gpsdevice.cc
index 2c8e5f6f7f60ffa8fd112f559b117fa6887cc0c2..2c9221e3f35313d54976b763210ef7e2bc3d3717 100644 (file)
--- a/jeeps/gpsdevice.cc
+++ b/jeeps/gpsdevice.cc
@@ -19,9 +19,9 @@
 
  */
 
-#include "gps.h"
-#include "gpsdevice.h"
-#include "gpsserial.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsdevice.h"
+#include "jeeps/gpsserial.h"
 
 extern gps_device_ops gps_serial_ops;
 extern gps_device_ops gps_usb_ops;

diff --git a/jeeps/gpsdevice.h b/jeeps/gpsdevice.h
index 194db59983745bc9f2c0b4be5c6dd2f611eb7386..539c8ebc4f901d6358d0cc2ed248a1a81e54887e 100644 (file)
--- a/jeeps/gpsdevice.h
+++ b/jeeps/gpsdevice.h
@@ -24,7 +24,7 @@
 
   typedef struct gpsdevh gpsdevh;
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
 #define usecDELAY 180000       /* Microseconds before GPS sends A001 */
 

diff --git a/jeeps/gpsdevice_ser.cc b/jeeps/gpsdevice_ser.cc
index d72f687ee77e39d04f21f30b5ac0f6eed8d200fc..2f02672c5954d768ffaa316e1802013994260655 100644 (file)
--- a/jeeps/gpsdevice_ser.cc
+++ b/jeeps/gpsdevice_ser.cc
@@ -19,10 +19,10 @@
 
  */
 
-#include "gps.h"
-#include "gpsdevice.h"
-#include "gpsread.h"
-#include "gpsserial.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsdevice.h"
+#include "jeeps/gpsread.h"
+#include "jeeps/gpsserial.h"
 
 gps_device_ops  gps_serial_ops = {
   GPS_Serial_On,

diff --git a/jeeps/gpsdevice_usb.cc b/jeeps/gpsdevice_usb.cc
index 96b227056f0fbfd00fc0c9211f316e3b877d1a96..31583c5c19124ae740be5680cb393db96e4d84b1 100644 (file)
--- a/jeeps/gpsdevice_usb.cc
+++ b/jeeps/gpsdevice_usb.cc
@@ -19,11 +19,11 @@
 
  */
 
-#include "gps.h"
-#include "garminusb.h"
-#include "gpsdevice.h"
-#include "gpsusbcommon.h"
-#include "gpsusbint.h"
+#include "jeeps/gps.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gpsdevice.h"
+#include "jeeps/gpsusbcommon.h"
+#include "jeeps/gpsusbint.h"
 
 garmin_unit_info_t garmin_unit_info[GUSB_MAX_UNITS];
 

diff --git a/jeeps/gpsfmt.cc b/jeeps/gpsfmt.cc
index e92db16a17519f06f9c9dcf17de5670f39174b41..b4657aee33bd91976c1a552c0e1392c8e72f1152 100644 (file)
--- a/jeeps/gpsfmt.cc
+++ b/jeeps/gpsfmt.cc
@@ -21,7 +21,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cstdio>
 #include <ctime>
 

diff --git a/jeeps/gpsfmt.h b/jeeps/gpsfmt.h
index 454cc77fd532b3cadc93452d58dab05631cb9ba4..cbaad086d6ae085366863b2673e9789c5842d193 100644 (file)
--- a/jeeps/gpsfmt.h
+++ b/jeeps/gpsfmt.h
@@ -2,7 +2,7 @@
 #define gpsfmt_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cstdio>
 #include <ctime>
 

diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc
index 4b071807d6ed344a1349244a6f676326a8c0e9b9..def95886cd73c9a3a8b30d4518fab2fe302d497f 100644 (file)
--- a/jeeps/gpslibusb.cc
+++ b/jeeps/gpslibusb.cc
@@ -25,7 +25,7 @@
 #include <cstdlib>
 #include <cstring>
 #if HAVE_CONFIG_H
-#include "config.h"
+#include "jeeps/config.h"
 #endif
 #if HAVE_LIBUSB_1_0
 #ifdef LIBUSB_H_INCLUDE
@@ -43,11 +43,11 @@
 #    include <libusb-1.0/libusb.h>
 #  endif
 #endif
-#include "../defs.h"
-#include "garminusb.h"
-#include "gpsdevice.h"
-#include "gpsusbcommon.h"
-#include "../garmin_device_xml.h"
+#include "defs.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gpsdevice.h"
+#include "jeeps/gpsusbcommon.h"
+#include "garmin_device_xml.h"
 
 #define GARMIN_VID 0x91e
 

diff --git a/jeeps/gpsmath.cc b/jeeps/gpsmath.cc
index 75a0a61cbffa22440f836dbd3fca4c069354f627..ce6aba487307fe94a7cb381807226be516c5e5d3 100644 (file)
--- a/jeeps/gpsmath.cc
+++ b/jeeps/gpsmath.cc
@@ -21,8 +21,8 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
-#include "gpsdatum.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsdatum.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>

diff --git a/jeeps/gpsmath.h b/jeeps/gpsmath.h
index 17e44cbd5baaa445ff1363d447d74eeeeb079bff..788e3d4bce8687fe17e7bdce6eb50644867f5459 100644 (file)
--- a/jeeps/gpsmath.h
+++ b/jeeps/gpsmath.h
@@ -1,7 +1,7 @@
 #ifndef gpsmath_h
 #define gpsmath_h
 
-#include "gpsport.h"
+#include "jeeps/gpsport.h"
 
 #define GPS_PI 3.141592653589
 #define GPS_FLTMIN 1.75494351E-38

diff --git a/jeeps/gpsmem.cc b/jeeps/gpsmem.cc
index fc83a5a7bb4105ec7766de50073b38e4f7900bc0..5489345aeee7a4749b13467d19941b8f09c6f547 100644 (file)
--- a/jeeps/gpsmem.cc
+++ b/jeeps/gpsmem.cc
@@ -24,7 +24,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cerrno>
 #include <climits>
 #include <cstdio>

diff --git a/jeeps/gpsmem.h b/jeeps/gpsmem.h
index fe8a73f8afd63f2cbca4ac71bc3b5bffccafeaf2..5d29231e14663ec95f3f15c038f021fc75adcd97 100644 (file)
--- a/jeeps/gpsmem.h
+++ b/jeeps/gpsmem.h
@@ -2,7 +2,7 @@
 #define gpsmem_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
   GPS_PPvt_Data     GPS_Pvt_New();
   void              GPS_Pvt_Del(GPS_PPvt_Data* thys);
   GPS_PAlmanac      GPS_Almanac_New();

diff --git a/jeeps/gpsproj.cc b/jeeps/gpsproj.cc
index 5392b249e4dfa9b3e04b626a5dfc204278e7e8b6..8f138e33b8fc7ecddfebb5fd0f422d0585faac10 100644 (file)
--- a/jeeps/gpsproj.cc
+++ b/jeeps/gpsproj.cc
@@ -21,7 +21,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cmath>
 #include <cstring>
 

diff --git a/jeeps/gpsproj.h b/jeeps/gpsproj.h
index 8cc210a263e8326f3b65808e01f0c592d156ef45..f76814560154b0312867480f0898d5a3c348953e 100644 (file)
--- a/jeeps/gpsproj.h
+++ b/jeeps/gpsproj.h
@@ -2,7 +2,7 @@
 #define gpsproj_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   void GPS_Math_Albers_LatLon_To_EN(double phi, double lambda, double* E,
                                     double* N, double phi1, double phi2,

diff --git a/jeeps/gpsprot.cc b/jeeps/gpsprot.cc
index 629e56364c4dc659fd411de173e0a9f9180e6c1d..7df2f0adb9dd69cfe737c61840ef0abae425090c 100644 (file)
--- a/jeeps/gpsprot.cc
+++ b/jeeps/gpsprot.cc
@@ -23,7 +23,7 @@
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
 #define COMMON
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cstdio>
 
 #define GPS_TAGUNK  20

diff --git a/jeeps/gpsprot.h b/jeeps/gpsprot.h
index 0c96ce3cd1c36376e60feb7a69d3d4d2f5c4f759..e16600fdf866c5cac5b5053e1c3cd1f1cbab7763 100644 (file)
--- a/jeeps/gpsprot.h
+++ b/jeeps/gpsprot.h
@@ -5,7 +5,7 @@
 #define COMMON extern
 #endif
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   /*
    *  Link protocols

diff --git a/jeeps/gpsread.cc b/jeeps/gpsread.cc
index dcf7c1a46740960ae97a4a121118183c8f364ef9..7dbeb76ec6b20607c52bfdad7a2b630bfec7a8fa 100644 (file)
--- a/jeeps/gpsread.cc
+++ b/jeeps/gpsread.cc
@@ -28,8 +28,8 @@
 #include <cstdlib>
 #include <ctime>
 
-#include "gps.h"
-#include "gpsserial.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsserial.h"
 
 
 /* @func GPS_Time_Now ***********************************************

diff --git a/jeeps/gpsread.h b/jeeps/gpsread.h
index 07f61d0c142124bc490084e5edfb59b99f7e71c4..6c57f2a2e6a232f09d5f284d0b0a296df59fc9d8 100644 (file)
--- a/jeeps/gpsread.h
+++ b/jeeps/gpsread.h
@@ -2,7 +2,7 @@
 #define gpsread_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   time_t GPS_Time_Now();
   int32  GPS_Serial_Packet_Read(gpsdevh* fd, GPS_PPacket* packet);

diff --git a/jeeps/gpsrqst.cc b/jeeps/gpsrqst.cc
index 84f672c6f5e8db79eb24990e9f2b486eeda1ef03..457eff8b10e73fdd5a1a86c54da48141dc388fb8 100644 (file)
--- a/jeeps/gpsrqst.cc
+++ b/jeeps/gpsrqst.cc
@@ -22,7 +22,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 
 
 static int32 GPS_A600_Rqst(gpsdevh* fd, time_t Time);

diff --git a/jeeps/gpsrqst.h b/jeeps/gpsrqst.h
index 4482066bf2b81ecc27a908fdd40b11e9ce1063b4..ad05722d6843da3bde1486207f2e92f2d9c44327 100644 (file)
--- a/jeeps/gpsrqst.h
+++ b/jeeps/gpsrqst.h
@@ -2,7 +2,7 @@
 #define gpsrqst_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   int32 GPS_Rqst_Send_Time(gpsdevh* fd, time_t Time);
   int32 GPS_Rqst_Send_Position(gpsdevh* fd, double lat, double lon);

diff --git a/jeeps/gpssend.cc b/jeeps/gpssend.cc
index 1416d78377da31dbc7c3ae3a5f57dba90d06aebc..71e7dc46a4b9b87ce6644d41c847773a18c6b4b3 100644 (file)
--- a/jeeps/gpssend.cc
+++ b/jeeps/gpssend.cc
@@ -27,8 +27,8 @@
 #include <cerrno>
 #include <cstdio>
 
-#include "gps.h"
-#include "gpsserial.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsserial.h"
 
 /* @funcstatic Build_Serial_Packet *************************************
 **

diff --git a/jeeps/gpssend.h b/jeeps/gpssend.h
index 870991138098a130565ce5d1c25e14d22f821c11..6a213dc88e36b6ec9783f994603a8d6383f07a1d 100644 (file)
--- a/jeeps/gpssend.h
+++ b/jeeps/gpssend.h
@@ -2,7 +2,7 @@
 #define gpssend_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
 #define GPS_ARB_LEN 1024
 

diff --git a/jeeps/gpsserial.cc b/jeeps/gpsserial.cc
index a637dd95d8e0bd1f6ac33fe4d83e2a0a8bd7af21..5aee770da9c293cc1a0bd683391840d23741f9ea 100644 (file)
--- a/jeeps/gpsserial.cc
+++ b/jeeps/gpsserial.cc
@@ -23,9 +23,9 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
-#include "../gbser.h"
-#include "gpsserial.h"
+#include "jeeps/gps.h"
+#include "gbser.h"
+#include "jeeps/gpsserial.h"
 #include <QtCore/QThread>
 #include <cerrno>
 #include <cstdio>

diff --git a/jeeps/gpsserial.h b/jeeps/gpsserial.h
index 80ddaf8e74eccf3d2a86c3e89682eac7ab0d6f51..f5eba487d1c8ea9609ba4092c8be6d8796b70bd4 100644 (file)
--- a/jeeps/gpsserial.h
+++ b/jeeps/gpsserial.h
@@ -2,7 +2,7 @@
 #define gpsserial_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
 #define usecDELAY 180000       /* Microseconds before GPS sends A001 */
 #define DEFAULT_BAUD 9600

diff --git a/jeeps/gpsusbcommon.cc b/jeeps/gpsusbcommon.cc
index b935e6cd428dc34e67b6fc7e4b71ae7be9a3dedb..6c37d0ba3dbd5d3a9be551b29b12674cd158223c 100644 (file)
--- a/jeeps/gpsusbcommon.cc
+++ b/jeeps/gpsusbcommon.cc
@@ -19,9 +19,9 @@
 
  */
 
-#include "gps.h"
-#include "garminusb.h"
-#include "gpsusbcommon.h"
+#include "jeeps/gps.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gpsusbcommon.h"
 
 /*
  * This receive logic is a little convoluted as we go to some efforts here

diff --git a/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc
index 9d20dbd8fe68d6e72ab4ab47752364b821037d73..5b6cc996de39b315d127c80e6b37c36d06e50b9d 100644 (file)
--- a/jeeps/gpsusbread.cc
+++ b/jeeps/gpsusbread.cc
@@ -18,9 +18,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */
-#include "garminusb.h"
-#include "gps.h"
-#include "gpsusbint.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsusbint.h"
 #include <cctype>
 
 /*

diff --git a/jeeps/gpsusbsend.cc b/jeeps/gpsusbsend.cc
index f3c8590952a7d704e1c2d591abf4b2d401a7cdf9..04ac456fa514b11f0c22bdab07e071229bc9a651 100644 (file)
--- a/jeeps/gpsusbsend.cc
+++ b/jeeps/gpsusbsend.cc
@@ -19,9 +19,9 @@
 
  */
 
-#include "gps.h"
-#include "garminusb.h"
-#include "gpsusbint.h"
+#include "jeeps/gps.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gpsusbint.h"
 #include <cerrno>
 #include <cstdio>
 

diff --git a/jeeps/gpsusbstub.cc b/jeeps/gpsusbstub.cc
index 8ffea63e91446f08ba16d4998ae8a4f99100db74..2f350b47932dfb512dfd289b2db3010d655d15c6 100644 (file)
--- a/jeeps/gpsusbstub.cc
+++ b/jeeps/gpsusbstub.cc
@@ -21,10 +21,10 @@
 
 
 #if HAVE_CONFIG_H
-#include "config.h"
+#include "jeeps/config.h"
 #endif
 
-#include "../defs.h"
+#include "defs.h"
 
 #if !HAVE_LIBUSB_1_0
 

diff --git a/jeeps/gpsusbwin.cc b/jeeps/gpsusbwin.cc
index 975663c3e0c70cec00a4236f9f409775797a8fcd..2198a6056c06512e8fec2b7ae20ae9c9a0f7dba1 100644 (file)
--- a/jeeps/gpsusbwin.cc
+++ b/jeeps/gpsusbwin.cc
@@ -27,11 +27,11 @@
 #include <setupapi.h>
 #include <winioctl.h>
 
-#include "../garmin_device_xml.h"
-#include "garminusb.h"
-#include "gps.h"
-#include "gpsapp.h"
-#include "gpsusbcommon.h"
+#include "garmin_device_xml.h"
+#include "jeeps/garminusb.h"
+#include "jeeps/gps.h"
+#include "jeeps/gpsapp.h"
+#include "jeeps/gpsusbcommon.h"
 
 /* Constants from Garmin doc. */
 

diff --git a/jeeps/gpsutil.h b/jeeps/gpsutil.h
index 2421d61e767864bc89f3709ed2afaccafe35821c..c51e5b03f0fe3b0d1340bd2ed4152295ac447f49 100644 (file)
--- a/jeeps/gpsutil.h
+++ b/jeeps/gpsutil.h
@@ -2,7 +2,7 @@
 #define gpsutil_h
 
 
-#include "gps.h"
+#include "jeeps/gps.h"
 
   int32  GPS_Util_Little();
 

diff --git a/jeeps/jgpsutil.cc b/jeeps/jgpsutil.cc
index e2d9ba05265e3afb0305384df018ea1989836fff..92721fc1ba9bb7997e8b52f60548fb6ca1c707e6 100644 (file)
--- a/jeeps/jgpsutil.cc
+++ b/jeeps/jgpsutil.cc
@@ -21,7 +21,7 @@
 ** Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ** Boston, MA  02110-1301, USA.
 ********************************************************************/
-#include "gps.h"
+#include "jeeps/gps.h"
 #include <cstdarg>
 #include <cstdlib>
 #include <fcntl.h>

diff --git a/src/core/usasciicodec.cc b/src/core/usasciicodec.cc
index bb655e9d8a684a00f5e56771232220fcf3bc662e..fe04b8d462aaafd2bfe6aa4997c40967dd34dcca 100644 (file)
--- a/src/core/usasciicodec.cc
+++ b/src/core/usasciicodec.cc
@@ -17,7 +17,7 @@
 
  */
 
-#include "usasciicodec.h"
+#include "src/core/usasciicodec.h"
 #include <QtCore/QByteArray>
 #include <QtCore/QChar>
 #include <QtCore/QLatin1Char>